Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 29 Jan 2010 15:20:05 +0000 (15:20 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 29 Jan 2010 15:20:05 +0000 (15:20 +0000)
commitdb9274ffb5dcfcbe6f950d645e533fefdb217945
tree00da5a9d720e4ff783eceab344857b179f1a3d15
parentfbd0ab479eb217025cdd171421ae787bbd159ea0
parentfe17273e5eda1fd5025daec6bcd9071b2421be1f
Merge from mainline.